bitkeeper revision 1.1173 (420ba26dU4VauWP5oFVWCo3QsMg0Jw)

Make everything compile again.

Signed-off-by: sos22@cl.cam.ac.uk.

diff --git a/xen/Rules.mk b/xen/Rules.mk
index f8def0ec885b3d5674abca63858c3f7bc7d7a575..4d594dd3d0a002aa3910fd3015eeae76dd6f5f04 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -1,7 +1,6 @@
 
 verbose     ?= n
 debug       ?= n
-debugger    ?= n
 perfc       ?= n
 trace       ?= n
 optimize    ?= y
@@ -57,9 +56,6 @@ endif
 
 ifeq ($(crash_debug),y)
 CFLAGS += -g -DCRASH_DEBUG
-ifeq ($(debugger),y)
-error Crash debugger conflicts with PDB
-endif
 endif
 
 ifeq ($(perfc),y)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index d0750ac4002b663e11397ba86af2cd8029b31353..c44d96fe9ab8dc967e679b91b02e355aee9711a2 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -12,7 +12,8 @@ OBJS := $(patsubst vmx%.o,,$(OBJS))
 endif
 
 ifneq ($(crash_debug),y)
-OBJS := $(subst cdb%.o,,$(OBJS))
+OBJS := $(patsubst cdb%.o,,$(OBJS))
+OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS))
 endif
 
 default: $(TARGET)